<html>
	<head>
	<script type="text/javascript" src="<?php echo base_url();?>js/jquery.js"></script>
	<script type="text/javascript">
	$(document).ready(function(){
	  $("p").click(function(){
	  $(this).hide();
	  });
	});
	</script>
	</head>

	<body>
	<p>If you click on me, I will disappear.</p>
    <p>测试修改文本冲突 testgit2</p>
	<p>git本地机测试文本改变222</p>
	<div>testgit1111修改了这行</div>
	<img src="<?php echo base_url();?>/images/file.gif" alt="image_error"/>
	</body>

</html>